browser-plugin: Add support for BROWSER_PLUGIN_DIR environment variable

This makes it easy to override where the plugin should be installed.

This is based on what totem does.

https://bugzilla.gnome.org/show_bug.cgi?id=659123

diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
index 4bfb35048a660749b94aad9a4abfa6f01f5a64df..0dc7da119f86e02ed08fd06941356ed7556e14cb 100644 (file)
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@@ -1,5 +1,5 @@
 
-mozillalibdir = $(libdir)/mozilla/plugins
+mozillalibdir = $(BROWSER_PLUGIN_DIR)
 
 mozillalib_LTLIBRARIES = libgnome-shell-browser-plugin.la
 

diff --git a/configure.ac b/configure.ac
index a7493c98351a9e398a91a6d4572d2a60356560c2..93dd0a0d4500fbd0d6984bbdb849915a7dc1b48b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -235,6 +235,9 @@ else
 fi
 AC_SUBST(SHELL_SYSTEM_CA_FILE,["$with_ca_certificates"])
 
+BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
+AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
+
 AC_CONFIG_FILES([
   Makefile
   data/Makefile